Merge pull request #20232 from totten/merge-master-5.37