Merge "Update the usage data when upstream is changed" into main