Merge branch 'jc/maint-test-portability' into 'jc/test-portability'