Merge from trunk, sonar big change