Merge "Remove local copy of the flag file" into main