Merge branch 'jk/replace-perl-in-built-scripts'