.......... [ZBX-8601] updated to the latest trunk