Merge branch...

Merge branch 'TS28.541_Rel16_CR_1064_correction_to_DRACHOptimizationFunction_stage_3_issue' into 'Integration_Rel16_SA5_152_YAML'

TS28.541_Rel16_CR_1064 DRACHOptimizationFunction_stage_3

See merge request !841