Auto-Merge pull request #2779 from rpv-tomsk/tmpfix