Merge "Import Jack server 1.3-a6"
am: 8b3eedb344

* commit '8b3eedb34432654a0884579a07137d56caf3dcb9':
  Import Jack server 1.3-a6