[PATCH v3 0/2] Fix persistent grants negotiation with a behavior change