MIFOSX-1267,MIFOSX-1221,MIFOSX-1207
Merge pull request #945 from lingalamadhukar/m_issues

MIFOSX-1267,MIFOSX-1221,MIFOSX-1207