Manual Merge of OperatorAll