What has been done in this MR?

What should testers check?

I have tested these changes thoroughly.
I used the relevant Zaros tool for any JSON edits where possible, and have attached screenshots of any changes.