Fixed MIFOSX-278 and MIFOSX-280
Merge remote-tracking branch 'ashok/MIFOSX-278'