Merge "Sonar Fix : Added logger"