What does this MR do?

Merges the security fixes from stable into develop, per !970 (merged).

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 merge request