[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski