Merge "Tuning the TouchExplorer"