am 91230fb3: Merge "Fixing issues in the TouchExplorer." into klp-dev

* commit '91230fb31ce602a96f1575d5281722c2aef5558c':
  Fixing issues in the TouchExplorer.