Merge "Rework supertx segment handling and adaptive quantization." into nextgenv2