bug #3993 Sorting in database overview with statistics doesn't work
Fix merge conflicts