An early PR to ease merging