Merge "Add primary keys to site_stats"