merged from dg