By Killyana, closes #2752 (cherry picked from commit 10edd860ee6a66a06ca9b47014fe4f393f556d20)
hotfixes