Merge branch 'meeting/LI71' into draft/104196