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