Synchronize changes from 1.6 branch [ci skip]

79331c3 Part 3 of "Rewrite crash handler" (after ca5ca19 and 47bb4bc)
0902200 Fix old server info bug (Displaying stale entry)

Author: github-actions[bot]