add monitor-sample
add monitor-sample
Merge branch 'master' into monitor
fix conflict