Merge branch 'new_view'
Merge branch 'new_view'
Merge branch 'master' into new_view