Resolve various Sonar issues
Resolve various Sonar issues
Merge remote-tracking branch 'origin/master' into dev-nmalik