Merge "ConnectionFactory- Fixed sonar issue"