Merge "Minor clean up." into rvc-dev