Merge "Address api feedback" into rvc-dev