Merge pull request #7252 from CarolEidt/x86GtObj