Non-js fixes cherrypick to staging

[TheDancingClown]

📝 A short description of the changes

• Non-js fixes cherrypick to staging

🔗 Link to the relevant story (or stories)

• https://app.asana.com/0/0/1205212499617362/f

Deployment implications

• None

✅ Checklist

• Features that cannot go live are behind a feature flag/env var or specify deploy date and open PR as draft
• I have checked that commit messages make sense and explain the reasoning for each change
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• I have added tests that prove my fix is effective or that my feature works
• I have squashed any unnecessary or part-finished commits