Merge branch 'nd/diff-with-path-params' into maint