Merge pull request #5172 from small-5/tmp-2