[Forwardport] Fix #13415 : Duplicated elements id#15704

julienanquetil wants to merge 1 commit into2.3-developmagento/magento2:2.3-developfrom

julienanquetil-13415magento/magento2:julienanquetil-13415Copy head branch name to clipboard