Fix issue related to SONAR-5419