Merge branch 'tmon-fixes' of .git into next