MIFOSX-1364
Merge pull request #966 from vishwasbabu/develop

MIFOSX-1364