Merge latest code from magento