Merge "Use full identity instead of package in historical stats" into sc-dev