Merge pull request #5171 from small-5/tmp-1