Merge pull request #5659 from kumpera/fix_59824