Merge pull request #723 from ahomatthew/develop

Develop
load context when referenced
Merge pull request #724 from Tendrid/develop

load context when referenced