Patch-3.1-druid-changes