Close #30919 --------- Co-authored-by: silverwind <me@silverwind.io> (cherry picked from commit 080486e47dba7ed767707fb0a2939677dfbcb0e3)