Merge "No need to poll for cleanup of directories." into sc-dev