Merge branch 'main' into nli/layoutmodel_improvements