Merge "Prevent error due to new API" into rvc-dev