[C] Sync ECB with current upstream 2.11 - see NEWS for details