Merge pull request #18940 from seamuslee001/5.32