MD-225

We don't require anymore to reset the context (we merged from save)