Cardpeek: Upstream Patch

Closes #32358.