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