[C] ECB: Sync with current upstream 1.95.1