Fixes #25097: Merged fi from 3.4.