Merge remote-tracking branch 'remotes/origin/main' into 749-splt_rendering-public-structure