Merge "Rewrite AtomicDirectory."