fleet/changes/37192-refactor-endpoint_utils