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