Merge "Report source of db closure" into main