[OLINGO-266] merge