Merge branch 'jn/perl-lib-extra'