Merge branch 'dl/test-must-fail-fixes-5'