Fixed remaining issues - MIFOSX-1388
Merge pull request #1001 from gauravsaini03/MIFOSX-1388

Fixed remaining issues - MIFOSX-1388