Upstream merge
Add more information and instructiions to some world crashes/issues
Make JSON errors more user friendly and less crash prone