NO CMCC merge