CONN-1028 PR modifications