merge with huamanshu 4 test