Merge "Sonar fix in log aspect"