[Forwardport] Fixxes #15565#21

gelanivishal merged 2 commits into2.3-developgelanivishal/magento2:2.3-developfrom

2.3-develop-PR-port-15566gelanivishal/magento2:2.3-develop-PR-port-15566Copy head branch name to clipboard