Master criteo

Backport upstream bugfix