Merge branch 'cr/103120/132' into 'meeting/LI73'

TS 103 120 CR132 - Corrections and clarifications

See merge request !322