Use combined config. This supersedes previous advice about duplicating config values for v1 / v2 and just makes it nicer for in general