.......... [ZBXNEXT-207] reverted last 2 commits