Merge "Removed below sonar issues:"