Merge "Fix for SONAR critical issues Issue-Id : SO-117"