Merge "Import Jack Carnac 1.2-a17"
am: c1743a679f

* commit 'c1743a679f40b217a5b67a6d0164874271990929':
  Import Jack Carnac 1.2-a17