Merge "add more debug info to SQL section in bugreport"