Closes #3461035 https://www.loom.com/share/37b081b91dea4b5e8678d809c4b4c7d8?sid=d49e1948-b948-47d1-88bd-cc49a0b59c1d