MIFOSX-1086 Resolved