MIFOSX-1144,MIFOSX-1073,,MIFOSX-1072,,MIFOSX-1022
Merge pull request #902 from lingalamadhukar/bug_fixes

Fixed issues MIFOSX-1144,MIFOSX-1073,,MIFOSX-1072,MIFOSX-1022