Bring in the changes to this fork from the base

@zendesk/zendesk-radar