Aligning with latest Olingo mods