Auto-Merge pull request #2786 from rpv-tomsk/fix-5.8