MIFOSX-1240,MIFOSX-1221,MIFOSX-1217
Merge pull request #943 from lingalamadhukar/m_issues

MIFOSX-1240,MIFOSX-1221,MIFOSX-1217