merged from hcz