Auto-Merge pull request #2629 from rpv-tomsk/fix-2626