Merge forwardport of #13174 to 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/13174.patch (created by @coderimus) based on commit(s):
  1. 7af2391

Author: magento-engcom-team