Merge branch 'zuber-view-refactor'