Merge branch 'ds/rev-parse-required-args' into maint