Merge pull request #2503 from valentinewallace/2023-08-fix-router-debug-panic