Merge "Fix InvalidInstanceID.NotFound handling"