sync main to develop

[abrokenjester]

GitHub issue resolved: #

Briefly describe the changes proposed in this PR:

---

PR Author Checklist (see the contributor guidelines for more details):

• my pull request is self-contained
• I've added tests for the changes I made
• I've applied code formatting (you can use mvn process-resources to format from the command line)
• I've squashed my commits where necessary
• every commit message starts with the issue number (GH-xxxx) followed by a meaningful description of the change

[abrokenjester]

For some reason main and develop were out of sync. Doing a manual merge.

[abrokenjester]

Ok, that didn't quite work. I'll try merging #4746 first.