[*] FO : Fix feature #PSCFV-11822, assign default combination image depending on cover if matches
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6