am cb623a8d: am f99e8650: am fed822cb: Merge "Fix Tethys asset" into klp-dev

* commit 'cb623a8d44cfef63133c3c8d1d8a31aa48ba57d2':
  Fix Tethys asset