Merge branch 'jc/test-portability' into maint