CONN-740 PR modifications