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