CONN-1191

Merging CONN-1207 onto the previous merge effort for CONN-1191