Merge branch 'jc/rerere-auto-more'