Merge branch 'pkgconfing-tests-requirement' into maint