.......... [ZBXNEXT-1078] updated from latest trunk