Merge pull request #5397 from kumpera/fix_41279