Merge branch 'jk/no-perl-tests' into maint