Merge branch 'vr/use-our-perl-in-tests' into maint