Merge "Add controller to show the summary" into pi-dev