Created by: Piszmog
Part of #31792.
TODO
Push commits to the source branch or add previously merged commits to review them.