Merge pull request #1651 from cuviper/rust-1.88.0

Merge pull request #1651 from cuviper/rust-1.88.0 #4093