Merge pull request #2529 from TheBlueMatt/2023-08-shutdown-remove-early-sign