.......... [ZBX-8484] updated to the latest /trunk