merge touchlist updates from master