From 011bb8159da28a1f1f6b86d59ceff15777a4e68d Mon Sep 17 00:00:00 2001
From: Ming Xue <c26420c06f9351e221f0@cloudflare.com>
Date: Sat, 22 Oct 2022 16:06:49 +0000
Subject: [PATCH] Merge definitions