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