Created by: tjdevries
Fixes #34296. Fixes #34295. Fixes #34297.
Push commits to the source branch or add previously merged commits to review them.