By Kilyana, updates #13707 (cherry picked from commit 41fe24e9ad537bacdbdef0b41b229de1f1383dab)
hotfixes