Sync libucl with upstream