MIFOSX-1332, MIFOSX-1331
Merge pull request #962 from lingalamadhukar/m_issues

MIFOSX-1332, MIFOSX-1331