Merge pull request #815 from TheBlueMatt/2021-03-router-fuzzzzzzzz