By Kilyana, closes #11142 (cherry picked from commit c0f6391a47313d60fc366c82a83d354d672e1cd4)
hotfixes