Added SONARJAVA-136