Change more than 20 files

Open Thomas Randolph requested to merge thomasrandolph-master-patch-35972 into master

What does this MR do?

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

Why was this MR needed?

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?