WIP: MR with source branch and single file change

Open Paul Slaughter requested to merge pslaughter-master-patch-85128 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?