Merge pull request #23047 from neheb/fu