Merge branch 'tg/rerere'