prepare for 2024.5, 2nd try

What does this PR do?

This is the same as !552 (merged), which was accidentally merged "squashed"

again, you've all seen these changes already

we probably need to revert 2532fea7 @fEmber is investigating

also @fEmber had some problems last night and I'd like to figure out why they happened

but we can do those after merging to develop and before actually releasing

Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines

• I agree to follow this project's Contribution Guidelines
• I have made sure to test this pull request