Merge branch 'rj/maint-test-fixes' into maint