Merge remote-tracking branch 'remotes/origin/main' into 1225-disclaimer-missing-for-external-renderer_updt
