Merge "Change flags namespace back to enterprise" into main