CONN-1278a: Addressed all the pr comments except wsdl update