Merge branch 'domob1812-extra-output' into deadlock-fixes2