2-4-stable

This PR is intended to create the `2-4-stable` branch.