Merge pull request #2767 from rpv-tomsk/tmpfix