Merge remote-tracking branch 'remotes/origin/main' into 1159-split-rendering-config-executed-in-non-split-rendering-cases