Merge "Add Enhanced Connectivity To Backup Tests" into rvc-dev