Merge pull request #7553 from etracer65/osd_profile_switch_msp_cms