Keep in sync with libfabric changes