Merge "Set up flag for phase1 API changes" into main