Merge pull request #26307 from nullaus/v2.1

Merge pull request #26125 from nullaus/bug1077595