Merge branch 'meeting/LI69' into draft/104144