[-] CORE : Fix #PSCFV-12072 follow up #1780
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6