Merge "Remove old flag replace with a new one" into main