Created by: efritz
Fixes #33836 (closed).
N/A.
Push commits to the source branch or add previously merged commits to review them.
