Merge branch 'jc/rerere'