This is a generic formulation, also used in Messaging API. Let's handle this issue separately from this PR.