Revert "Revert "5.24""

This reverts commit 659dcf52ce7f5565102f0532dfadea9ffbe38e4a.
5.24