Fixed #673 + #1742
What has been done in this MR?
- Closes #673
- Closes #1742
What should testers check?
- All comments in #673 have been resolved
- All comments in #1742 have been resolved
-
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.
Edited by GregF