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