Merge pull request #5407 from kumpera/fix_31225