Auto-Merge pull request #2683 from rpv-tomsk/fix-2607