and https://github.com/facebook/osquery/pull/5256

This one is not rebased on experimental branch. @seph may I ask you to do it?

Re-targeted to experimental and regenerated! 👍