Bug 431702 - Performance bottleneck in engine executor