Merge "Update the default owner" into rvc-dev