Merge pull request #14579 from neheb/wge