azzarcher committed [r4]

Client commit

azzarcher committed [r3]

azzarcher committed [r2]

Server-side

azzarcher committed [r1]