[*] BO : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/891 1/2