Merge "Fix service touch exploration." into tm-dev