t1200: prepare for merging with Fast-forward bikeshedding