Sync with IETF88 submission