Merge "Avoid transfering a large usage events list in one transaction" into main