Improvement/3.x/sonarissues