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