Merge "Fix sonar build"