Merge "Rename RefactorFlag methods" into main