Merge "BUG-731 : removed critical sonar warnings"