PIM-3415: Split methods to decrease the cyclomatic complexity value
PIM-3415: Change method name
Merge pull request #1814 from akeneo/refactor-PIM-3415

PIM-3415: Split methods to decrease the cyclomatic complexity value