SONAR-5209 Apply issues feedback