Fix context issue
Merge branch 'master' into iate