reposurgeon 3.0

Closes #26031.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Merge remote-tracking branch 'upstream/master'