LARGE MR comparing 13.5.3 and 13.5.4

Open André Luís requested to merge 13-5-stable-ee-patch-4 into 13-5-stable-ee-patch-3

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?

Closes #13