Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6