Merge pull request #14493 from neheb/gp