cherry pick 84afb70754856faa703ec58991d961b1fec11d36
cherry pick 84afb70754856faa703ec58991d961b1fec11d36

cdiacon/dotmailer-magento2-extension,adeelq/dotmailer-magento2-extension,adeelq/dotmailer-magento2-extension,dotmailer/dotmailer-magento2-extension,dotmailer/dotmailer-magento2-extension,cdiacon/dotmailer-magento2-extension,dotmailer/dotmailer-magento2-extension,adeelq/dotmailer-magento2-extension,cdiacon/dotmailer-magento2-extension