reference: use distribution reference and remove fork Upstream-commit: 326583e728 Component: cli
326583e728