Merge branch 'am/cherry-pick-rerere'