Merge "Optimize STREQUENT queries and fix estimated table row counts" into ics-mr1