Merge "Flag cleanup" into main