Merge "fix clang warning in rdopt"