updata to 4.2

Signed-off-by: zhangn1985 <zhangn1985@gmail.com>