PIM-2511 fixes
Merge pull request #1412 from akeneo/fix/PIM-2511

PIM-2511 fixes