Merge "Fix wrong Sonar suppressions"