merge from devcnf/cnf