Merge pull request #5355 from kumpera/fix_58379