CONN-953 modifications