Merge pull request #20740 from seamuslee001/5.39