Changes to issue: MIFOSX-949,