Merge "Correct flag namespace" into main