activate monitoring and fix unblocking
Merge branch 'master' into gh-pages