Auto-Merge pull request #2734 from rpv-tomsk/fix-2732