Sync gengrid type change with upstream