merged from coccoc branch