Merge remote-tracking branch 'remotes/origin/main' into 383-unused-functions-more