MAGE-506: reverted for now because of problems during pushing products