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