Adapt consumer-provider SAP fix
Adapt consumer-provider SAP fix

5GExchange/escape,5GExchange/escape,hsnlab/escape,5GExchange/escape,hsnlab/escape,hsnlab/escape,hsnlab/escape,5GExchange/escape,5GExchange/escape,hsnlab/escape,5GExchange/escape,hsnlab/escape