Merge "[incremental] change temp dir"