Merge branch 'jk/rev-parse-cleanup' into maint