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