updates for ofuz zendesk #14738#