Merge branch 'main' into 1398-compilation-errors-for-split-rendering-code-when-debugging-is-enabled