Merge branch 'pb/maint-use-custom-perl' into maint