Merge remote-tracking branch 'origin/main' into 740-masa-pre-rendering-disabled-in-validity-check