Merge branch 'jk/am-rerere-lock-fix'