Merge branch 'main' into 1164-cleanup-outdated-renderer-configuration-files