Fixes #25097: Merged fix from 3.5.