MIFOSX-1209,MIFOSX-1328
Merge pull request #961 from lingalamadhukar/m_issues

MIFOSX-1209,MIFOSX-1328