Merge pull request #26125 from nullaus/bug1077595

Bug1077595
(cherry picked from commit 906123b6d71bcd9d8db77227ffba7269e6cbaeb9)
Merge pull request #26307 from nullaus/v2.1

Merge pull request #26125 from nullaus/bug1077595