Port v6 cleanup to v4#2305

ericsciple merged 1 commit intoreleases/v4actions/checkout:releases/v4from

users/ericsciple/25-11-clean2actions/checkout:users/ericsciple/25-11-clean2Copy head branch name to clipboard