Merge pull request #7919 from codecae/cms_flag_fix