Resolved mor sonar issues
Merge pull request #1483 from pveentjer/improvement/3.x/sonarissues

Resolved more sonar issues