Feature/pim 1673

Bug fix: [yes]
Feature addition: [yes]
Backwards compatibility break: [no]
Unit test passes: [yes]
Behat scenarios passes: [yes|no]
Checkstyle issues: [no]*
ChangeLog updated: [no]
Documentation PR: []
Fixes the following jira: PIM-1673