[PATCH] setup: Sync with upstream