WIP: CE->EE merge for `9-2-stable-ee`

Closed username-removed-407765 requested to merge ce-to-ee-for-9-2-stable-ee into 9-2-stable-ee

What does this MR do?

Are there points in the code the reviewer needs to double check?

  • Any flaws in this strategy?

Why was this MR needed?

  • 9-2-stable-ee needs to be up to date with CE.

Does this MR meet the acceptance criteria?