Merge pull request #4222 from alexanderkyte/fix_mismatch_com_disabled