[OLINGO-971] Improve CMP Support
4 files changed