Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'