Merge branch 'cb/cherry-pick-rev-path-confusion' into maint