Merge "Add resource loop for deletion"