[OLINGO-129] Merge with master branch