[WIP] Fix/pim 1594 beta3

Bug fix: [yes]
Feature addition: [no]
Backwards compatibility break: [no]
Unit test passes: [yes]
Behat scenarios passes: [?]
Checkstyle issues: [no]
ChangeLog updated: [yes]
Fixes the following jira:
 - PIM-1594