Merge pull request #5567 from kumpera/fix_59334