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