Merge pull request #21924 from nullaus/v2.0

Merge pull request #21913 from nullaus/bug1038167