Merge Tony's one touch record improvements (bug #3263)