CR 1353 Tdoc S5-245690
This MR is merged to Integration branch via commit: 4829b9ee Hence MR is closed directed (instead of merged, too late to be merged)