Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
Revert "Corrected CabOfDMI function"

This reverts commit 5e7f7fcde62c60ccebd8cd2ca34bb5b5e1dfc617.
Merge branch 'Upstream/master'
Revert "Revert "Corrected CabOfDMI function""

This reverts commit 5004644e431549ed14506c3bca0c0f80d25a0443.
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
EA_TEST Test for 3.8.2.1
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'
Merge branch 'origin/master'
EA_TEST Started test 3.8.5.1.2
EA_TEST Wrote actions for 3.8.5.1.2
EA_TEST Most of the test for 3.8.5.1.2
Merged modelling of emergency stops
Undid changes made to understand the test
EA_TEST wrote test for 3.8.5.1.2
EA_TEST Work on test for 3.8.5.1.2
EA_TEST Most of 3.8.5.1.2 done