Add the reset mechanism on the server side
Merge branch 'tmp'