Mini-epic: move remaining to v4