Hotfix v0.88.3 proposed changes into master

Intent

Given the issues with translations caused by having to wait on Crowdin fixing the html-json plugin we decided it was better to merges the proposed hotfix changes from !1229 (closed) into master (with some fixes for changes in master).

---

• This is meant for a hotfix
• This is meant for the next release (see milestone)
• This needs more reviewers than normal; there may be controversy or high complexity
• This intentionally introduces regressions that will be addressed later
• There is/will be documentation changes on the wiki
• Please do not send commits here without coordinating closely with the owner
• This is a Build System change

Related Issues

• N/A

Steps to Test

1. N/A already tested