By Killyana, closes #12253 (cherry picked from commit 87ab218faab5e60af7910b72cde031e9dd46e639)
hotfixes