Merge new summary view branches changes into trunk