Closes #22046 Closes #22029 By DanVS and ZenoX92 (cherry picked from commit 626b7332d1a4ccdbdc354f403ce2f157ef623c23)