Mpr fixes

Create a branch for the merge, so it's easier to do local testing without having to constantly revert out of master.

Pinging @Carreau for input, since mpr was his...