Merge remote-tracking branch 'remotes/origin/main' into 743-render_config_handle-defined-twice