Fix #33066 (cherry picked from commit aca21549f285255f0d78f90f1f15f0c6f9396761)
Fix #21062 --------- Co-authored-by: Zettat123 <zettat123@gmail.com> (cherry picked from commit 5df9fd3e9c6ae7f848da65dbe9b9d321f29c003a)