Merge branch 'jk/cherry-pick-reword' into maint