Merge pull request #9574 from neheb/gdd