@Stefano Bonicatti this might introduce a merge conflict, but it should be merged before a release IMO: https://github.com/osquery/osquery/pull/5748