Port for Magento 2 DEV BETA