Merge branch 'bl/view'