fix performance issues WIP #10588