merged from xc