Merge branch 'jn/perl-funcname' into next