By Killyana, closes #10203 (cherry picked from commit 6fa2edebf1e8f6ddd7f3a166ec6ccf73685e089f)
hotfixes