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