Merge branch 'tg/next/0.4_testrun_fixes' into next