Applied view-patch; fix
Merge branch 'develop'