Merge Main -> Trainyard Update. Kept destination changes for locomotive.entity - will re-do the small change from Main.