Merge branch 'summary_view'