Restore lost commits from MAGENTO-465
Merge branch 'refs/heads/develop'