Adding default context
Merge branch 'develop'