MAGE-471: added slightly modified changes again