Fix: :execution_context flag after merge of #17099 [fixup #17100] (#17104)