.......... [ZBXNEXT-166] merged from upstream