[C] ECB: sync with current upstream 1.94