Merged context creation BacMatch workaround from 2.7.1.
2 files changed