Feature/pim 1252

```
Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Unit test passes: no
Behat scenarios passes: no
Checkstyle issues: yes
Documentation PR:
Fixes the following jira:
 - PIM-1252
```