[-] WS : Fix #PSCFV-11636 & #PSCSX-3274
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6