Support merging back in to v1