Merge pull request #5390 from kumpera/fix_58637