Merge branch 'rd/test-path-utils' into maint