#MIFOSX-988,#MIFOSX-989,#MIFOSX-987,#MIFOSX-952
Merge pull request #842 from lingalamadhukar/bug_fixes

#MIFOSX-988,#MIFOSX-989,#MIFOSX-987,#MIFOSX-952