[#32395] CS errors found in CMS build (mostly com_config related) (Fix #2303)