CONN-520: updates to fix DS regression tests.