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