Merge "Bring palette back to nextgenv2" into nextgenv2