Wp 1024 conn opt

Connection optimization changes

Jira Issue: WP-1024