Merge "Always ignore summaries" into pi-dev