Merge from main. Conflicts on train tunnel double switch and single corner, accepted main version so needs redoing locally with any changes