Merge "SF: fix a crash in FlagManager" into main