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