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