Merge "implement assistant service connection"