user is not required in context if correct template_context_processor is
used
Merge remote-tracking branch 'agiliq/develop' into develop