Merge pull request #14059 from Stoob/patch-2