CONN-1300: Updated PR with all the issues fixed during testing.