bug #3996 Drizzle navigation doesn't expand
Fix merge conflicts