[-] FO: Improve performance of some SQL requests #PSCSX-2321
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6