MAGE-3615 add more comments