By Killyana, closes #2465 (cherry picked from commit 6acffca64ded4da8174e879edb97aa3b89806b4a)
hotfixes