Should we merge https://github.com/osquery/osquery/pull/7059 and https://github.com/osquery/osquery/pull/7046 now that we’ve cut 7.8.0 or wait to make sure nothing is broken? 😉