ABM token can not work if it is downloaded from an existing ABM Device Management Service

Hi Dear Apple experts,

I am hitting a problem (observed from Apr-15, maybe earlier) for renewing ABM/DEP token from my MDM server.

My renewal steps:

1. Download public key from my MDM server
2. Upload the public key to the ABM Device Management server instance in ABM portal, and download a new token
3. Upload the new token to my MDM server

The problem here is at step-2:

1. If upload the public key to an existing ABM Device Management server instance in ABM portal, then the generated token will be rejected by my MDM server with error "Could not find recipient info";

2. However, if upload the public key to a newly created ABM Device Management server instance, then everything is good.

So, looks to me, it is the token issue when renewing an existing ABM MDM instance.

Could you please help take a look?

Thanks, Wei