[-] Core : Fix PSCSX-1240 and repair query
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6