.......... [ZBXNEXT-1036] updated to the latest trunk and fixed conflicts