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