Closes #21713: Merge with 3.4