https://github.com/osquery/osquery/pull/8592 does not need to be merged before the release, but should be merged before April 15 when they turn off the ubuntu20 runner and many of our CI jobs will start failing.