Merge pull request #14316 from neheb/gn