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