By Killyana, closes #13676 (cherry picked from commit 5ae6b9dc504d2ce6170b1b504ee8f60dacb0abd4)
hotfixes