Merge "Sonar issues clean-up"