Merge "Fix initialization problem in rsCPP."