Auto-Merge pull request #2813 from rpv-tomsk/master