As you can see in your mentioned issue comment, I tried the solution of Xaconi from on 5 Oct 2018
and it did NOT work for both kind of products in cart.
Hope https://github.com/PrestaShop/PrestaShop/issues/10264#issuecomment-458211709 is working. I got to try soon.