Merge "Updates based on API council feedback." into rvc-dev