Merge changes from topics 'cghosh-4jan-sonarfix', 'cghosh-4jan-sonar-fix'