Merge branch '3736_mc_tmpdir'