[MIFOSX-876] AND [MIFOSX-877] has been fixed and resolved