Merge "More usage tracking"