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