reposurgeon 3.1

Closes #26320.

Signed-off-by: Brett Koonce <koonce@gmail.com>