Merge "UpdateHandler to support v202 dicts."