Merge `master` into `v2_id_acl`

Merging with master before progressing into issue #32 (closed), working up Access Control semantics.