Merge "Ensure connection is non-null" into rvc-dev