Merge branch "createusers-pubkeys"