Merge pull request #1061 from dell/usr/saksham/system_info_bug_1053