Yesterday
Merge from ziggurat_perf_fixes