Merge "Update some external conversion tables to latest versions"