Merge branch 'jc/rerere-train-modernise'