temporary updates to MIFOSX-735 to fix MIFOSX-742