ROBE-116 bulk sonar issues
Merge remote-tracking branch 'origin/master'