Merge "Sonar ignored test"