Merge "Allow app to conntect to BufferHub service"