Older devices are sending "gpc": 1 and this can't marshal. (#4070)

Older devices are sending "gpc": 1 and this can't marshal. (#4070) #2351