Merge "Add more logging for fatal errors" into main