Conn 891

Alamelu's PR for CONN-891 + changes to get the testing working.