Merge "General sonar fixes: use logger"