v1.0.7
b277f36d · Merge pull request #22563 from bdarnell/1.0-backports ·