Merge "Correct the data usage warning" into main