* Prevent error on missing view data
Merge branch 'develop' into release