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