added the proper rendering to the request context in the template
Merge branch 'feature-lib'