Merge pull request #64 from luisromangz/8.2-SNAPSHOT

Fixed #80958, readded changes from current week lost in mega merge and refixed #80948