Patch-5.2-mage-changes