greenFlagFix
Merge branch 'hotfix/flag_status'