CONN-995 Modifications