Merge pull request #2783 from rpv-tomsk/tmpfix