refactoring
turing on/off local monitoring
Merge branch 'origin/master'
Merge branch 'origin/master'