Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change'