am be3095ed: AutoJoin fixes:

* commit 'be3095ed758fca076b9ccb9fdae48f7f865c078a':
  AutoJoin fixes:
tree: ace432f3d537631b807be6a6cb4bf33e5c4628d7
  1. service/