Fix ABI compatibility (#1961)
3 files changed