Merge "Resolved below sonar issues:"