.......... [ZBXNEXT-1229] updated to the latest trunk