MIFOSX-311: cherry pick of fix from 0.11.4 branch.