MIFOSX-1179 Finished