Merge "Quick compiler: fix compile-time perf regression"