Merge branch 'TS28.541_Rel18_CR0962_NRM_enhancements_for_BSFFunction' into...

Merge branch 'TS28.541_Rel18_CR0962_NRM_enhancements_for_BSFFunction' into 'Integration_Rel18_SA5_150_YAML'

TS28.541_Rel18_CR0962

See merge request !710