Merge pull request #19398 from seamuslee001/5.34