Merge branch 'resilient-user-view' into 'develop'