Fixes for #81811 and #82025.
Merge pull request #77 from luisromangz/8.5-SNAPSHOT

Fixes for #81911 and #82025.