Merge "Address API feedback." into rvc-dev