[*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/582