re #870 - Import missing view
Merge branch 'feature/870-questions' into staging