master
Squashed commit of the following:
Creating the possibility to add the additional MB4 shield in Phase2 scenarios