Base new context on old context.
Merge pull request #1790 from okonomiyaki3000/2.5.x-use_default_context

2.5.x use default context