middle commit
Merge branch 'dmitryhd-dev' of https://github.com/dmitryhd/NMS into dmitryhd-dev
collector changed
quick fix collector, test works