By Ariel-, closes #17083 (cherry picked from commit 945abb163c11c76e6196e9aae53972f1e021c091)
hotfixes