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