[C] ECB: Sync with current upstream 2.31