Handle resumption_token dictionaries
Merge branch 'bpl-fixes' into develop