[OLINGO-971] Merged branch OLINGO-971-ImproveCmpSupport into master