MIFOSX-329: bring in contribution from gsoc student yanna.