Cherry-pick 10383 into r2.0.0
Duplicate of #10517 
[🤖]: Hi @ashors1 👋,<br><br>we've cherry picked ` (10383)` into `r2.0.0` for you! 🚀<br><br>Please review and approve this cherry pick by your convenience!