merged from doz