Fix #29562 Follow #29531 (cherry picked from commit 7ec4c65ea5d5a3765d24ee68ae421f2f911b6b5d)
gt-
tw-