Closes #25399 Based on dr-j's script (cherry picked from commit 29b39ae6063f69e185b26712079c5b77000027b5)