Merge fix PIM-3254 on master

cf https://github.com/akeneo/pim-community-dev/pull/1661