Merge branch '4535_tmpdir_name'