Alexander Belanger f0d4448f72 resolve merge conflicts with master 4 lat temu
..
client 39472e1ffa add namespace comments 4 lat temu
server f0d4448f72 resolve merge conflicts with master 4 lat temu
types f0d4448f72 resolve merge conflicts with master 4 lat temu