MSCS improvements

Maxime FRIESSrequested to merge
maxime.friess/t432_las21_t3_b:master into master

Merge request reports