close channel
Merge branch 'dev' into 'master'

close channel

rt
fix bugs, make build pass
Merge branch 'dev' into 'master'

little modify

make build pass