Merge "Code DCT tokens with ANS" into nextgenv2