Cherry-Pick from forks

[martok]

(Permanent meta-issue for things from forks. Yes, I might be pre-empting planned PRs here 😉 ) (❗ - critical, ⚠️ - bugfix, ✨ - feature)

• [x] UCyborg@e9f2403d0c7f76 ❗
• [x] UCyborg@9cc5655f3ef01 ❗ (also, toJSON is a helper function so should be in utils.js, not nested)
• [x] UCyborg@6183a847 ✨
• [x] UCyborg@0b0fb23fc10c6138 ⚠️