This logic sits in the API, we don't want to duplicate it in the SDK. We can apply this fix in the SDK once this(insert here) API issue has been closed.