Merge "Bug-731: Fixed few major Sonar warnings"