Merge "Wedge rd improvements" into nextgenv2