Expose root context
Merge branch 'master' into develop