Merge branch 'ab/maint-perl-use-instlibdir' into next