Auto-Merge pull request #2610 from rpv-tomsk/fix-2609