v6.10 Mainly fixes around rev1.2 tests