Merge pull request #9721 from neheb/gd2