Merge branch 'jk/no-perl'