updated stack-optimized-operator-executor patch - removed code duplication