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