Merge branch 'zil-performance'