Fixed copying the context.
Merge branch 'template-rendering' into deployed