MIFOSX - 1425
Merge pull request #1060 from rishy/MIFOSX-1425

MIFOSX - 1425