Merge "Clarify valid value ranges" into nextgenv2