Merge status

[robin]

Jfyi, I've merged in all pending merge requests and fastpath changes,
but haven't pushed them yet as there are some baseline changes that
I'm still confirming.

Robin