Merge branch 'garret-smith-gs-typespec-fixes'