Bus 80 stop mismatch

Merged Yu Long requested to merge BUS-80_stop_mismatch into develop

Merge request reports