convert by @Killyana, closes #10802 (cherry picked from commit 526da9c985cadf8655e0a5ce35b1e228422584f4)
hotfixes