And https://github.com/facebook/osquery/pull/5247 which will probably conflict with @seph but is earlier