Merge "Add clamping to parameter search" into nextgenv2