Merge "Sonar Fix - ConnectionFactory.java"