Merge branch 'cr/104144/029' into 'meeting/LI73'

TS 104 144 CR029 - Corrections and clarifications

See merge request !336