Merge "Cleaned up database reconnection logic"