<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #36807 cherry-pick for https://github.com/fleetdm/fleet/pull/37062
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #36807 cherry-pick for https://github.com/fleetdm/fleet/pull/37062