Merge "Add flags for new features" into main