MIFOSX-1023 work in progess