CONN-1028 PR Changes