Merge "Adjust code for API council feedback" into rvc-dev