Closes #18170 By Staleness89 (cherry picked from commit c88dd5b1cd3848ad32cd9d35b6cc6bff897834e3)
hotfixes