Merge remote-tracking branch 'origin/main' into sam-add-freeze-layout