correct timetable conversion on tuesday Mantis 28820
merge V2_4