Merge "Offer a stricter way to prepare directories."