Merge "fix major sonar bug"