The post-Roubaix wash and brush-up

no copy in legacy cms