Merge pull request #117451 from StarryWorm/variant-gdtype