should dev be merged into Dev?

i'm happy for this PR to remain open with any outstanding bugs for that version listed here, but maintaining the differences due to UUID vs simpleID differences means that almost all PR's for Dev are code conflicts with this branch.