Merge pull request #18805 from kamil-tekiela/Remove-globals-in-operations