Context fixes for 2.7
Merge pull request #7 from lsuits/27_readiness

Context fixes for 2.7