Merge "Revert "Report long database transactions"" into main