Sync with Encoding Standard updates.