Perf issue 8732