checkpoint
server handles all relevant conditions
Merge branch 'dev-thingol'

* dev-thingol:
  server handles all relevant conditions
  checkpoint