Merge branch 'ep/fix-test-lib-functions-report' into maint