Merge "TouchExplorer - refactoring and a couple of bug fixes"