Temporary Duality fork to push PRs upstream