merge ABI changes from upstream