Context stuffs for 2.7
Merge pull request #1 from lsuits/27_readiness

Context stuffs for 2.7