Merge branch 'hotfix/views-caching'
Update header text on view header.
Merge branch 'master' into develop