Pr rebase 3046

Rebase of #3046, first bumping starr to M6
(Left other versions as-is, as something seems wrong with partest.
Looking into that now.)