Merge pull request #16344 from brunotag/patch-1