sonar fixes

2 jobs for !336 with sonar-fixes in 1 minute (queued for 5 seconds)
latest merge request