MIFOSX-1384 Resolved