Implemented ERA solution to CR 1084, and fixes to the Supervised target calculation.
Fixed preindication due to the CR
Refactoring in the XML
Ported the bugfix for the MRDT in ERA_CR to the main branch