Merge "Sonar fix logger"