Merge "Rd fixes and cleanups" into nextgenv2