Merge "Wait for instance deletion"