Merged from matamx/druid