Merge changes I69128db9,I13db22f8

* changes:
  Implement onServiceConflict
  Add replying to queries