Merge "updated to support RemoteSecurityGroup"