Merge "Add flag for new APIs" into main