Merge pull request #2845 from rpv-tomsk/tmpfix