[WIP]PIM-3443

| Q                    | A
| -------------------- | ---
| Bug fix?             | yes
| New feature?         | No
| BC breaks?           | ?
| CI currently passes? | yes
| Tests pass?          | ?
| Scenarios pass?      | ?
| Checkstyle issues?*  | No
| PMD issues?**        | No
| Changelog updated?   | No
| Fixed tickets        | PIM-3443
| DB schema updated?   | No
| Migration script?    | No
| Doc PR               | No