By Kilyana, closes #10475 (cherry picked from commit 5f033694dac42b910a5edd5c77037762105da2a5)
hotfixes