Merge branch '1332-drop-perl-dependency' into 'master'