merge from cettox