Starsign support for P21, version bump
reenable auto swap with neutral for p21+