I know this is not part of this PR, but we have now moved to the new CAPI...