Merge branch 'test_fixup' into T1.5