Merge "Change flag bug to non-FR bug" into main