Merge branch 'jc/maint-test-portability'