Merge branch 'uaccess' (batched user access infrastructure)