By @Killyana Closes #4458 (cherry picked from commit 2b51726fd009d580578c7bd363ce528e5dbf119c)
hotfixes