Merge "Control API review changes" into rvc-dev