Improvement/3.x/entryprocessor starvation