LAC-85: Fix for sonar
Merge remote-tracking branch 'origin/master'