Merge branch 'tsqbx' into more-perf-cost