Merge branch 'feature/outlet-view-hash'