v3.3.1: don’t crash on new RPC fields

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Merge branch 'release/3.3.1' into develop