Merge branch '5021-reset-makeups-to-do-when-changing-from-std-to-non-std-shift'…

Merge branch '5021-reset-makeups-to-do-when-changing-from-std-to-non-std-shift' into 'dev_cooperatic'

extract method, create method to simulate bdm lowering all makeups_to_do and…

See merge request !237