RE: [C] Packages: ECB: Sync with current upstream 1.96