.......... [ZBXNEXT-2354] merged from upstream (except vmware related changes)