Merge pull request #5396 from kumpera/fix_11696