Alexander Belanger 37ccb51504 update usage endpoint as well 4 anni fa
..
client f872cb66ff merge with master and fix merge conflicts 4 anni fa
server 37ccb51504 update usage endpoint as well 4 anni fa
types f872cb66ff merge with master and fix merge conflicts 4 anni fa