Fix export products scenario
Merge branch 'master' into pim-upgrade-beta5