ECL-124 Sonar related-issues in preparation for the Release