MIFOSX-1358,MIFOSX-1357
Merge pull request #978 from lingalamadhukar/MIFOSX-1358

MIFOSX-1358,MIFOSX-1357