Merge "Fix Sonar build problems"