Merge "Replace arbitrary number with defs" into nextgenv2