Merge branch 'hotfix/flag_color'
greenFlagFix
Merge branch 'hotfix/flag_status' into develop