Merge pull request #1564 from TheBlueMatt/2022-06-panic-on-behind