Merge pull request #120792 from Thiago-Weiss/master