Support altering response behavior in client interface
Merge branch 'timestamp-to-clients' into develop

* timestamp-to-clients:
  Support altering response behavior in client interface