Sync with _common updates.