Merge "Import Jack server 1.3-a7" am: 98e456ae95
am: 45b47cfd0d

* commit '45b47cfd0d9bd9eb1cea59ed6fcaac794b3742c0':
  Import Jack server 1.3-a7