Patch-5.2-druid-changes