By Kilyana, closes #3756 (cherry picked from commit 25346c7cd00ad7ae838b8bea3333a429e6623037)
hotfixes