Fixed quant merge conflict - diff-e65288356485a0927532b70464ad2d038dec4fbef60839c1855b2f06ff3cf88c