Merge "String updates - touch to tap"