Patch to incorporate return type fix shared by merchant#70

SalmanTwo merged 2 commits intomaintwo-inc/magento-plugin:mainfrom

developtwo-inc/magento-plugin:developCopy head branch name to clipboard