Merge "[last-mile] keep tracing until validation has been confirmed"