Merge "Fix flag bug id." into main