Pull mm-context-fix into release branch