Merge pull request #5406 from kumpera/fix_12157