Merge "Add sleep(2) when try to delete a container"