By @Killyana Closes #4878 (cherry picked from commit a95bfa6a73b676773915c559daec8af8e1b6ba7a)
hotfixes