Closes #18402: Merge with 3.4