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