Merge branch 'bc/fix-cherry-pick-root' into maint