Merge duplicate_account_tables and remote_os_stats