modularzing counterblockd
Merge remote-tracking branch 'origin/develop' into modular-dev