Merge "Update model when adding favorites" into rvc-dev