Merge branch 'TS28.105_Rel19_Correct_associations_on_Training' into...

Merge branch 'TS28.105_Rel19_Correct_associations_on_Training' into 'Integration_Rel19_SA5_165_YAML'

TS28.105_Rel19_CR0316_Correct_associations_on_Training_NRM_fragment

See merge request !2036