Merge "Remove pair quantization"