CONN-601: fix and regression test updates.