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