committing changes for latest sonar 3.7.4