Merge pull request #10648 from micmac1/gdnut