Merge "Cleaned up 24Q1 flags" into main