updated stack-optimized-operator-executor patch - removed code duplication
(cherry-picked from 8902147)