Merge "rdopt: clear maybe-uninitialized variable warning" into nextgenv2