Merge "Recover tile coding performance" into nextgenv2