Merge "Hide APIs introduced in earlier commit" into rvc-dev