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