Merge branch...

Merge branch 'TS28.312_Rel-18_CR0095_Correct_issues_for_Service_Support_Expectation' into 'Integration_Rel18_SA5_150_YAML'

Correct issues for Service Support Expectation

See merge request !726