Merge "Fix some ans const warnings." into nextgenv2