ref: refs/heads/sf/deckard-rebase-20260415
