temporary updates to MIFOSX-735 to fix MIFOSX-742
Merge pull request #639 from vishwasbabu/develop

temporary updates to MIFOSX-735 to fix MIFOSX-742