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