By Killyana, closes #965 (cherry picked from commit 2023dd4a3256ee15127b9cac0fa245baf21e4d68)
hotfixes