Merge Stephen Davie's record route patches