Merge "Fixed sonar issues in Factory class"