Merge "Prioritize dynamic summaries" into pi-dev