merge from cnnic git