DON'T MERGE:Improvement/3.x/entryprocessor starvation