Merge "Move BackupAgent connection to a helper class" into main