Merge trunk(Sonar big change)