Merge "Revert "Fixed the incorrect flag type"" into main