Mage-3.1-changes