Issue #180 + Script runner performance optimizations.