Merge "Follow API refactoring." into rvc-dev