Merge branch 'jn/userdiff-perl-updates'