Merge "Fix issue when adding existing connections via remote connection services." into sc-dev