Merge branch 'jc/rerere-train'