By Killyana, closes #3905 (cherry picked from commit 7bbdf7fb26df36daae97e657d20a8add9b8b6ef2)
hotfixes